BigW Consortium Gitlab

Skip to content

G
gitlab-ce
Commit 92bedb38 by Kamil Trzciński
Options

Merge branch '40573-rename-gke-as-kubernetes-engine' into 'master'

Rename GKE as Kubernetes Engine Closes #40537 See merge request gitlab-org/gitlab-ce!15608
parents 222df36c c21b488e
Showing with 215 additions and 210 deletions
app/views/projects/clusters/_advanced_settings.html.haml
......@@ -2,14 +2,14 @@
- if @cluster.managed?
.append-bottom-20
%label.append-bottom-10
= s_('ClusterIntegration|Google Container Engine')
= s_('ClusterIntegration|Google Kubernetes Engine')
%p
- link_gke = link_to(s_('ClusterIntegration|Google Container Engine'), @cluster.gke_cluster_url, target: '_blank', rel: 'noopener noreferrer')
- link_gke = link_to(s_('ClusterIntegration|Google Kubernetes Engine'), @cluster.gke_cluster_url, target: '_blank', rel: 'noopener noreferrer')
= s_('ClusterIntegration|Manage your cluster by visiting %{link_gke}').html_safe % { link_gke: link_gke }
.well.form-group
%label.text-danger
= s_('ClusterIntegration|Remove cluster integration')
%p
= s_('ClusterIntegration|Removing cluster integration will remove the cluster configuration you have added to this project. It will not delete your cluster on Google Container Engine.')
= link_to(s_('ClusterIntegration|Remove integration'), namespace_project_cluster_path(@project.namespace, @project, @cluster.id), method: :delete, class: 'btn btn-danger', data: { confirm: "Are you sure you want to remove cluster integration from this project? This will not delete your cluster on Google Container Engine"})
= s_('ClusterIntegration|Removing cluster integration will remove the cluster configuration you have added to this project. It will not delete your cluster on Google Kubernetes Engine.')
= link_to(s_('ClusterIntegration|Remove integration'), namespace_project_cluster_path(@project.namespace, @project, @cluster.id), method: :delete, class: 'btn btn-danger', data: { confirm: "Are you sure you want to remove cluster integration from this project? This will not delete your cluster on Google Kubernetes Engine"})
app/views/projects/clusters/_banner.html.haml
......@@ -2,14 +2,14 @@
.settings-content
.hidden.js-cluster-error.alert.alert-danger.alert-block.append-bottom-10{ role: 'alert' }
= s_('ClusterIntegration|Something went wrong while creating your cluster on Google Container Engine')
= s_('ClusterIntegration|Something went wrong while creating your cluster on Google Kubernetes Engine')
%p.js-error-reason
.hidden.js-cluster-creating.alert.alert-info.alert-block.append-bottom-10{ role: 'alert' }
= s_('ClusterIntegration|Cluster is being created on Google Container Engine...')
= s_('ClusterIntegration|Cluster is being created on Google Kubernetes Engine...')
.hidden.js-cluster-success.alert.alert-success.alert-block.append-bottom-10{ role: 'alert' }
= s_('ClusterIntegration|Cluster was successfully created on Google Container Engine. Refresh the page to see cluster\'s details')
= s_('ClusterIntegration|Cluster was successfully created on Google Kubernetes Engine. Refresh the page to see cluster\'s details')
%p
- if @cluster.enabled?
......
app/views/projects/clusters/_dropdown.html.haml
......@@ -7,6 +7,6 @@
= icon('chevron-down')
%ul.dropdown-menu.clusters-dropdown-menu.dropdown-menu-full-width
%li
= link_to(s_('ClusterIntegration|Create cluster on Google Container Engine'), gcp_new_namespace_project_clusters_path(@project.namespace, @project))
= link_to(s_('ClusterIntegration|Create cluster on Google Kubernetes Engine'), gcp_new_namespace_project_clusters_path(@project.namespace, @project))
%li
= link_to(s_('ClusterIntegration|Add an existing cluster'), user_new_namespace_project_clusters_path(@project.namespace, @project))
app/views/projects/clusters/gcp/_header.html.haml
......@@ -4,11 +4,11 @@
= s_('ClusterIntegration|Please make sure that your Google account meets the following requirements:')
%ul
%li
- link_to_container_engine = link_to(s_('ClusterIntegration|access to Google Container Engine'), 'https://console.cloud.google.com', target: '_blank', rel: 'noopener noreferrer')
= s_('ClusterIntegration|Your account must have %{link_to_container_engine}').html_safe % { link_to_container_engine: link_to_container_engine }
- link_to_kubernetes_engine = link_to(s_('ClusterIntegration|access to Google Kubernetes Engine'), 'https://console.cloud.google.com', target: '_blank', rel: 'noopener noreferrer')
= s_('ClusterIntegration|Your account must have %{link_to_kubernetes_engine}').html_safe % { link_to_kubernetes_engine: link_to_kubernetes_engine }
%li
- link_to_requirements = link_to(s_('ClusterIntegration|meets the requirements'), 'https://cloud.google.com/container-engine/docs/quickstart', target: '_blank', rel: 'noopener noreferrer')
- link_to_requirements = link_to(s_('ClusterIntegration|meets the requirements'), 'https://cloud.google.com/kubernetes-engine/docs/quickstart', target: '_blank', rel: 'noopener noreferrer')
= s_('ClusterIntegration|Make sure your account %{link_to_requirements} to create clusters').html_safe % { link_to_requirements: link_to_requirements }
%li
- link_to_container_project = link_to(s_('ClusterIntegration|Google Container Engine project'), target: '_blank', rel: 'noopener noreferrer')
- link_to_container_project = link_to(s_('ClusterIntegration|Google Kubernetes Engine project'), target: '_blank', rel: 'noopener noreferrer')
= s_('ClusterIntegration|This account must have permissions to create a cluster in the %{link_to_container_project} specified below').html_safe % { link_to_container_project: link_to_container_project }
app/views/projects/clusters/gcp/login.html.haml
......@@ -5,7 +5,7 @@
.col-sm-4
= render 'projects/clusters/sidebar'
.col-sm-8
= render 'projects/clusters/dropdown', dropdown_text: s_('ClusterIntegration|Create cluster on Google Container Engine')
= render 'projects/clusters/dropdown', dropdown_text: s_('ClusterIntegration|Create cluster on Google Kubernetes Engine')
= render 'header'
.row
.col-sm-8.col-sm-offset-4.signin-with-google
......
app/views/projects/clusters/gcp/new.html.haml
......@@ -5,6 +5,6 @@
.col-sm-4
= render 'projects/clusters/sidebar'
.col-sm-8
= render 'projects/clusters/dropdown', dropdown_text: s_('ClusterIntegration|Create cluster on Google Container Engine')
= render 'projects/clusters/dropdown', dropdown_text: s_('ClusterIntegration|Create cluster on Google Kubernetes Engine')
= render 'header'
= render 'form'
app/views/projects/clusters/new.html.haml
......@@ -7,7 +7,7 @@
.col-sm-8
%h4.prepend-top-0= s_('ClusterIntegration|Choose how to set up cluster integration')
%p= s_('ClusterIntegration|Create a new cluster on Google Engine right from GitLab')
%p= s_('ClusterIntegration|Create a new cluster on Google Kubernetes Engine right from GitLab')
= link_to s_('ClusterIntegration|Create on GKE'), gcp_new_namespace_project_clusters_path(@project.namespace, @project), class: 'btn append-bottom-20'
%p= s_('ClusterIntegration|Enter the details for an existing Kubernetes cluster')
= link_to s_('ClusterIntegration|Add an existing cluster'), user_new_namespace_project_clusters_path(@project.namespace, @project), class: 'btn append-bottom-20'
changelogs/unreleased/40573-rename-gke-as-kubernetes-engine.yml 0 → 100644
---
title: Rename GKE as Kubernetes Engine
merge_request: 15608
author: Takuya Noguchi
type: other
doc/ci/autodeploy/quick_start_guide.md
......@@ -11,11 +11,11 @@ We made a minimal [Ruby application](https://gitlab.com/gitlab-examples/minimal-
Let’s start by forking our sample application. Go to [the project page](https://gitlab.com/gitlab-examples/minimal-ruby-app) and press the `Fork` button. Soon you should have a project under your namespace with the necessary files.
## Setup your own cluster on Google Container Engine
## Setup your own cluster on Google Kubernetes Engine
If you do not already have a Google Cloud account, create one at https://console.cloud.google.com.
Visit the [`Container Engine`](https://console.cloud.google.com/kubernetes/list) tab and create a new cluster. You can change the name and leave the rest of the default settings. Once you have your cluster running, you need to connect to the cluster by following the Google interface.
Visit the [`Kubernetes Engine`](https://console.cloud.google.com/kubernetes/list) tab and create a new cluster. You can change the name and leave the rest of the default settings. Once you have your cluster running, you need to connect to the cluster by following the Google interface.
## Connect to Kubernetes cluster
......
doc/install/kubernetes/gitlab_chart.md
# GitLab Helm Chart
> **Note**:
* This chart is deprecated, and is being replaced by the [cloud native GitLab chart](https://gitlab.com/charts/helm.gitlab.io/blob/master/README.md). For more information on available charts, please see our [overview](index.md#chart-overview).
* These charts have been tested on Google Container Engine and Azure Container Service. Other Kubernetes installations may work as well, if not please [open an issue](https://gitlab.com/charts/charts.gitlab.io/issues).
* These charts have been tested on Google Kubernetes Engine and Azure Container Service. Other Kubernetes installations may work as well, if not please [open an issue](https://gitlab.com/charts/charts.gitlab.io/issues).
For more information on available GitLab Helm Charts, please see our [overview](index.md#chart-overview).
......@@ -243,7 +243,7 @@ controller. For `nginx-ingress` you can check the
on how to add the annotation to the `controller.service.annotations` array.
>**Note:**
When using the `nginx-ingress` controller on Google Container Engine (GKE), and using the `external-traffic` annotation,
When using the `nginx-ingress` controller on Google Kubernetes Engine (GKE), and using the `external-traffic` annotation,
you will need to additionally set the `controller.kind` to be DaemonSet. Otherwise only pods running on the same node
as the nginx controller will be able to reach GitLab. This may result in pods within your cluster not being able to reach GitLab.
See the [Kubernetes documentation](https://kubernetes.io/docs/tutorials/services/source-ip/#source-ip-for-services-with-typeloadbalancer) and
......
doc/install/kubernetes/gitlab_omnibus.md
# GitLab-Omnibus Helm Chart
> **Note:**
* This Helm chart is in beta, and will be deprecated by the [cloud native GitLab chart](https://gitlab.com/charts/helm.gitlab.io/blob/master/README.md).
* These charts have been tested on Google Container Engine and Azure Container Service. Other Kubernetes installations may work as well, if not please [open an issue](https://gitlab.com/charts/charts.gitlab.io/issues).
* These charts have been tested on Google Kubernetes Engine and Azure Container Service. Other Kubernetes installations may work as well, if not please [open an issue](https://gitlab.com/charts/charts.gitlab.io/issues).
This work is based partially on: https://github.com/lwolf/kubernetes-gitlab/. GitLab would like to thank Sergey Nuzhdin for his work.
......@@ -72,7 +72,7 @@ Other common configuration options:
- `baseIP`: the desired [external IP address](#external-ip-recommended)
- `gitlab`: Choose the [desired edition](https://about.gitlab.com/products), either `ee` or `ce`. `ce` is the default.
- `gitlabEELicense`: For Enterprise Edition, the [license](https://docs.gitlab.com/ee/user/admin_area/license.html) can be installed directly via the Chart
- `provider`: Optimizes the deployment for a cloud provider. The default is `gke` for [Google Container Engine](https://cloud.google.com/container-engine/), with `acs` also supported for the [Azure Container Service](https://azure.microsoft.com/en-us/services/container-service/).
- `provider`: Optimizes the deployment for a cloud provider. The default is `gke` for [Google Kubernetes Engine](https://cloud.google.com/kubernetes-engine/), with `acs` also supported for the [Azure Container Service](https://azure.microsoft.com/en-us/services/container-service/).
For additional configuration options, consult the [values.yaml](https://gitlab.com/charts/charts.gitlab.io/blob/master/charts/gitlab-omnibus/values.yaml).
......
doc/install/kubernetes/gitlab_runner_chart.md
# GitLab Runner Helm Chart
> **Note:**
These charts have been tested on Google Container Engine and Azure Container Service. Other Kubernetes installations may work as well, if not please [open an issue](https://gitlab.com/charts/charts.gitlab.io/issues).
These charts have been tested on Google Kubernetes Engine and Azure Container Service. Other Kubernetes installations may work as well, if not please [open an issue](https://gitlab.com/charts/charts.gitlab.io/issues).
The `gitlab-runner` Helm chart deploys a GitLab Runner instance into your
Kubernetes cluster.
......
doc/install/kubernetes/index.md
# Installing GitLab on Kubernetes
> **Note**: These charts have been tested on Google Container Engine and Azure Container Service. Other Kubernetes installations may work as well, if not please [open an issue](https://gitlab.com/charts/charts.gitlab.io/issues).
> **Note**: These charts have been tested on Google Kubernetes Engine and Azure Container Service. Other Kubernetes installations may work as well, if not please [open an issue](https://gitlab.com/charts/charts.gitlab.io/issues).
The easiest method to deploy GitLab on [Kubernetes](https://kubernetes.io/) is
to take advantage of GitLab's Helm charts. [Helm] is a package
......
doc/topics/autodevops/quick_start_guide.md
......@@ -23,12 +23,12 @@ page](https://gitlab.com/auto-devops-examples/minimal-ruby-app) and press the
**Fork** button. Soon you should have a project under your namespace with the
necessary files.
## Setup your own cluster on Google Container Engine
## Setup your own cluster on Google Kubernetes Engine
If you do not already have a Google Cloud account, create one at
https://console.cloud.google.com.
Visit the [**Container Engine**](https://console.cloud.google.com/kubernetes/list)
Visit the [**Kubernetes Engine**](https://console.cloud.google.com/kubernetes/list)
tab and create a new cluster. You can change the name and leave the rest of the
default settings. Once you have your cluster running, you need to connect to the
cluster by following the Google interface.
......
doc/user/project/index.md
......@@ -64,7 +64,7 @@ common actions on issues or merge requests
- [Pipeline settings](pipelines/settings.md): Set up Git strategy (choose the default way your repository is fetched from GitLab in a job),
timeout (defines the maximum amount of time in minutes that a job is able run), custom path for `.gitlab-ci.yml`, test coverage parsing, pipeline's visibility, and much more
- [GKE cluster integration](clusters/index.md): Connecting your GitLab project
with Google Container Engine
with Google Kubernetes Engine
- [GitLab Pages](pages/index.md): Build, test, and deploy your static
website with GitLab Pages
......
locale/bg/gitlab.po
......@@ -504,13 +504,13 @@ msgstr ""
msgid "ClusterIntegration|Cluster integration is enabled for this project. Disabling this integration will not affect your cluster, it will only temporarily turn off GitLab's connection to it."
msgstr ""
msgid "ClusterIntegration|Cluster is being created on Google Container Engine..."
msgid "ClusterIntegration|Cluster is being created on Google Kubernetes Engine..."
msgstr ""
msgid "ClusterIntegration|Cluster name"
msgstr ""
msgid "ClusterIntegration|Cluster was successfully created on Google Container Engine"
msgid "ClusterIntegration|Cluster was successfully created on Google Kubernetes Engine"
msgstr ""
msgid "ClusterIntegration|Copy cluster name"
......@@ -519,7 +519,7 @@ msgstr ""
msgid "ClusterIntegration|Create cluster"
msgstr ""
msgid "ClusterIntegration|Create new cluster on Google Container Engine"
msgid "ClusterIntegration|Create new cluster on Google Kubernetes Engine"
msgstr ""
msgid "ClusterIntegration|Enable cluster integration"
......@@ -528,10 +528,10 @@ msgstr ""
msgid "ClusterIntegration|Google Cloud Platform project ID"
msgstr ""
msgid "ClusterIntegration|Google Container Engine"
msgid "ClusterIntegration|Google Kubernetes Engine"
msgstr ""
msgid "ClusterIntegration|Google Container Engine project"
msgid "ClusterIntegration|Google Kubernetes Engine project"
msgstr ""
msgid "ClusterIntegration|Learn more about %{link_to_documentation}"
......@@ -585,7 +585,7 @@ msgstr ""
msgid "ClusterIntegration|Something went wrong on our end."
msgstr ""
msgid "ClusterIntegration|Something went wrong while creating your cluster on Google Container Engine"
msgid "ClusterIntegration|Something went wrong while creating your cluster on Google Kubernetes Engine"
msgstr ""
msgid "ClusterIntegration|Toggle Cluster"
......@@ -594,13 +594,13 @@ msgstr ""
msgid "ClusterIntegration|With a cluster associated to this project, you can use review apps, deploy your applications, run your pipelines, and much more in an easy way."
msgstr ""
msgid "ClusterIntegration|Your account must have %{link_to_container_engine}"
msgid "ClusterIntegration|Your account must have %{link_to_kubernetes_engine}"
msgstr ""
msgid "ClusterIntegration|Zone"
msgstr ""
msgid "ClusterIntegration|access to Google Container Engine"
msgid "ClusterIntegration|access to Google Kubernetes Engine"
msgstr ""
msgid "ClusterIntegration|cluster"
......
locale/de/gitlab.po
......@@ -504,13 +504,13 @@ msgstr ""
msgid "ClusterIntegration|Cluster integration is enabled for this project. Disabling this integration will not affect your cluster, it will only temporarily turn off GitLab's connection to it."
msgstr ""
msgid "ClusterIntegration|Cluster is being created on Google Container Engine..."
msgid "ClusterIntegration|Cluster is being created on Google Kubernetes Engine..."
msgstr ""
msgid "ClusterIntegration|Cluster name"
msgstr ""
msgid "ClusterIntegration|Cluster was successfully created on Google Container Engine"
msgid "ClusterIntegration|Cluster was successfully created on Google Kubernetes Engine"
msgstr ""
msgid "ClusterIntegration|Copy cluster name"
......@@ -519,7 +519,7 @@ msgstr ""
msgid "ClusterIntegration|Create cluster"
msgstr ""
msgid "ClusterIntegration|Create new cluster on Google Container Engine"
msgid "ClusterIntegration|Create new cluster on Google Kubernetes Engine"
msgstr ""
msgid "ClusterIntegration|Enable cluster integration"
......@@ -528,10 +528,10 @@ msgstr ""
msgid "ClusterIntegration|Google Cloud Platform project ID"
msgstr ""
msgid "ClusterIntegration|Google Container Engine"
msgid "ClusterIntegration|Google Kubernetes Engine"
msgstr ""
msgid "ClusterIntegration|Google Container Engine project"
msgid "ClusterIntegration|Google Kubernetes Engine project"
msgstr ""
msgid "ClusterIntegration|Learn more about %{link_to_documentation}"
......@@ -585,7 +585,7 @@ msgstr ""
msgid "ClusterIntegration|Something went wrong on our end."
msgstr ""
msgid "ClusterIntegration|Something went wrong while creating your cluster on Google Container Engine"
msgid "ClusterIntegration|Something went wrong while creating your cluster on Google Kubernetes Engine"
msgstr ""
msgid "ClusterIntegration|Toggle Cluster"
......@@ -594,13 +594,13 @@ msgstr ""
msgid "ClusterIntegration|With a cluster associated to this project, you can use review apps, deploy your applications, run your pipelines, and much more in an easy way."
msgstr ""
msgid "ClusterIntegration|Your account must have %{link_to_container_engine}"
msgid "ClusterIntegration|Your account must have %{link_to_kubernetes_engine}"
msgstr ""
msgid "ClusterIntegration|Zone"
msgstr ""
msgid "ClusterIntegration|access to Google Container Engine"
msgid "ClusterIntegration|access to Google Kubernetes Engine"
msgstr ""
msgid "ClusterIntegration|cluster"
......
locale/eo/gitlab.po
......@@ -504,13 +504,13 @@ msgstr ""
msgid "ClusterIntegration|Cluster integration is enabled for this project. Disabling this integration will not affect your cluster, it will only temporarily turn off GitLab's connection to it."
msgstr ""
msgid "ClusterIntegration|Cluster is being created on Google Container Engine..."
msgid "ClusterIntegration|Cluster is being created on Google Kubernetes Engine..."
msgstr ""
msgid "ClusterIntegration|Cluster name"
msgstr ""
msgid "ClusterIntegration|Cluster was successfully created on Google Container Engine"
msgid "ClusterIntegration|Cluster was successfully created on Google Kubernetes Engine"
msgstr ""
msgid "ClusterIntegration|Copy cluster name"
......@@ -519,7 +519,7 @@ msgstr ""
msgid "ClusterIntegration|Create cluster"
msgstr ""
msgid "ClusterIntegration|Create new cluster on Google Container Engine"
msgid "ClusterIntegration|Create new cluster on Google Kubernetes Engine"
msgstr ""
msgid "ClusterIntegration|Enable cluster integration"
......@@ -528,10 +528,10 @@ msgstr ""
msgid "ClusterIntegration|Google Cloud Platform project ID"
msgstr ""
msgid "ClusterIntegration|Google Container Engine"
msgid "ClusterIntegration|Google Kubernetes Engine"
msgstr ""
msgid "ClusterIntegration|Google Container Engine project"
msgid "ClusterIntegration|Google Kubernetes Engine project"
msgstr ""
msgid "ClusterIntegration|Learn more about %{link_to_documentation}"
......@@ -585,7 +585,7 @@ msgstr ""
msgid "ClusterIntegration|Something went wrong on our end."
msgstr ""
msgid "ClusterIntegration|Something went wrong while creating your cluster on Google Container Engine"
msgid "ClusterIntegration|Something went wrong while creating your cluster on Google Kubernetes Engine"
msgstr ""
msgid "ClusterIntegration|Toggle Cluster"
......@@ -594,13 +594,13 @@ msgstr ""
msgid "ClusterIntegration|With a cluster associated to this project, you can use review apps, deploy your applications, run your pipelines, and much more in an easy way."
msgstr ""
msgid "ClusterIntegration|Your account must have %{link_to_container_engine}"
msgid "ClusterIntegration|Your account must have %{link_to_kubernetes_engine}"
msgstr ""
msgid "ClusterIntegration|Zone"
msgstr ""
msgid "ClusterIntegration|access to Google Container Engine"
msgid "ClusterIntegration|access to Google Kubernetes Engine"
msgstr ""
msgid "ClusterIntegration|cluster"
......
locale/es/gitlab.po
......@@ -504,13 +504,13 @@ msgstr ""
msgid "ClusterIntegration|Cluster integration is enabled for this project. Disabling this integration will not affect your cluster, it will only temporarily turn off GitLab's connection to it."
msgstr ""
msgid "ClusterIntegration|Cluster is being created on Google Container Engine..."
msgid "ClusterIntegration|Cluster is being created on Google Kubernetes Engine..."
msgstr ""
msgid "ClusterIntegration|Cluster name"
msgstr ""
msgid "ClusterIntegration|Cluster was successfully created on Google Container Engine"
msgid "ClusterIntegration|Cluster was successfully created on Google Kubernetes Engine"
msgstr ""
msgid "ClusterIntegration|Copy cluster name"
......@@ -519,7 +519,7 @@ msgstr ""
msgid "ClusterIntegration|Create cluster"
msgstr ""
msgid "ClusterIntegration|Create new cluster on Google Container Engine"
msgid "ClusterIntegration|Create new cluster on Google Kubernetes Engine"
msgstr ""
msgid "ClusterIntegration|Enable cluster integration"
......@@ -528,10 +528,10 @@ msgstr ""
msgid "ClusterIntegration|Google Cloud Platform project ID"
msgstr ""
msgid "ClusterIntegration|Google Container Engine"
msgid "ClusterIntegration|Google Kubernetes Engine"
msgstr ""
msgid "ClusterIntegration|Google Container Engine project"
msgid "ClusterIntegration|Google Kubernetes Engine project"
msgstr ""
msgid "ClusterIntegration|Learn more about %{link_to_documentation}"
......@@ -585,7 +585,7 @@ msgstr ""
msgid "ClusterIntegration|Something went wrong on our end."
msgstr ""
msgid "ClusterIntegration|Something went wrong while creating your cluster on Google Container Engine"
msgid "ClusterIntegration|Something went wrong while creating your cluster on Google Kubernetes Engine"
msgstr ""
msgid "ClusterIntegration|Toggle Cluster"
......@@ -594,13 +594,13 @@ msgstr ""
msgid "ClusterIntegration|With a cluster associated to this project, you can use review apps, deploy your applications, run your pipelines, and much more in an easy way."
msgstr ""
msgid "ClusterIntegration|Your account must have %{link_to_container_engine}"
msgid "ClusterIntegration|Your account must have %{link_to_kubernetes_engine}"
msgstr ""
msgid "ClusterIntegration|Zone"
msgstr ""
msgid "ClusterIntegration|access to Google Container Engine"
msgid "ClusterIntegration|access to Google Kubernetes Engine"
msgstr ""
msgid "ClusterIntegration|cluster"
......
locale/fr/gitlab.po
......@@ -504,14 +504,14 @@ msgstr "L'intégration du cluster est activée pour ce projet."
msgid "ClusterIntegration|Cluster integration is enabled for this project. Disabling this integration will not affect your cluster, it will only temporarily turn off GitLab's connection to it."
msgstr "L'intégration de cluster est activée pour ce projet. La désactivation de cette intégration n’affectera pas votre cluster, il coupera temporairement la connexion de GitLab à celui-ci."
msgid "ClusterIntegration|Cluster is being created on Google Container Engine..."
msgstr "Le cluster est en cours de création sur Google Container Engine…"
msgid "ClusterIntegration|Cluster is being created on Google Kubernetes Engine..."
msgstr "Le cluster est en cours de création sur Google Kubernetes Engine…"
msgid "ClusterIntegration|Cluster name"
msgstr "Nom du cluster"
msgid "ClusterIntegration|Cluster was successfully created on Google Container Engine"
msgstr "Le cluster a été correctement créé sur Google Container Engine"
msgid "ClusterIntegration|Cluster was successfully created on Google Kubernetes Engine"
msgstr "Le cluster a été correctement créé sur Google Kubernetes Engine"
msgid "ClusterIntegration|Copy cluster name"
msgstr "Copier le nom du cluster"
......@@ -519,8 +519,8 @@ msgstr "Copier le nom du cluster"
msgid "ClusterIntegration|Create cluster"
msgstr "Créer le cluster"
msgid "ClusterIntegration|Create new cluster on Google Container Engine"
msgstr "Créer un nouveau cluster sur Google Container Engine"
msgid "ClusterIntegration|Create new cluster on Google Kubernetes Engine"
msgstr "Créer un nouveau cluster sur Google Kubernetes Engine"
msgid "ClusterIntegration|Enable cluster integration"
msgstr "Activer l’intégration du cluster"
......@@ -528,11 +528,11 @@ msgstr "Activer l’intégration du cluster"
msgid "ClusterIntegration|Google Cloud Platform project ID"
msgstr "ID de projet Google Cloud Platform"
msgid "ClusterIntegration|Google Container Engine"
msgstr "Google Container Engine"
msgid "ClusterIntegration|Google Kubernetes Engine"
msgstr "Google Kubernetes Engine"
msgid "ClusterIntegration|Google Container Engine project"
msgstr "Google Container Engine"
msgid "ClusterIntegration|Google Kubernetes Engine project"
msgstr "Google Kubernetes Engine"
msgid "ClusterIntegration|Learn more about %{link_to_documentation}"
msgstr "En savoir plus sur %{link_to_documentation}"
......@@ -585,8 +585,8 @@ msgstr "Voir les zones"
msgid "ClusterIntegration|Something went wrong on our end."
msgstr "Un problème est survenu de notre côté."
msgid "ClusterIntegration|Something went wrong while creating your cluster on Google Container Engine"
msgstr "Un problème est survenu lors de la création de votre cluster sur Google Container Engine."
msgid "ClusterIntegration|Something went wrong while creating your cluster on Google Kubernetes Engine"
msgstr "Un problème est survenu lors de la création de votre cluster sur Google Kubernetes Engine."
msgid "ClusterIntegration|Toggle Cluster"
msgstr "Activer/désactiver le cluster"
......@@ -594,14 +594,14 @@ msgstr "Activer/désactiver le cluster"
msgid "ClusterIntegration|With a cluster associated to this project, you can use review apps, deploy your applications, run your pipelines, and much more in an easy way."
msgstr "Avec un cluster associé à ce projet, vous pouvez utiliser des applications de revue, déployer vos applications, exécuter vos pipelines et bien plus encore, de manière très simple."
msgid "ClusterIntegration|Your account must have %{link_to_container_engine}"
msgstr "Votre compte doit disposer de %{link_to_container_engine}"
msgid "ClusterIntegration|Your account must have %{link_to_kubernetes_engine}"
msgstr "Votre compte doit disposer de %{link_to_kubernetes_engine}"
msgid "ClusterIntegration|Zone"
msgstr "Zone"
msgid "ClusterIntegration|access to Google Container Engine"
msgstr "Accéder à Google Container Engine"
msgid "ClusterIntegration|access to Google Kubernetes Engine"
msgstr "Accéder à Google Kubernetes Engine"
msgid "ClusterIntegration|cluster"
msgstr "cluster"
......
locale/gitlab.pot
......@@ -494,13 +494,13 @@ msgstr ""
msgid "ClusterIntegration|Cluster integration is enabled for this project. Disabling this integration will not affect your cluster, it will only temporarily turn off GitLab's connection to it."
msgstr ""
msgid "ClusterIntegration|Cluster is being created on Google Container Engine..."
msgid "ClusterIntegration|Cluster is being created on Google Kubernetes Engine..."
msgstr ""
msgid "ClusterIntegration|Cluster name"
msgstr ""
msgid "ClusterIntegration|Cluster was successfully created on Google Container Engine. Refresh the page to see cluster's details"
msgid "ClusterIntegration|Cluster was successfully created on Google Kubernetes Engine. Refresh the page to see cluster's details"
msgstr ""
msgid "ClusterIntegration|Clusters allow you to use review apps, deploy your applications, run your pipelines, and much more in an easy way. %{link_to_help_page}"
......@@ -524,7 +524,7 @@ msgstr ""
msgid "ClusterIntegration|Create cluster"
msgstr ""
msgid "ClusterIntegration|Create cluster on Google Container Engine"
msgid "ClusterIntegration|Create cluster on Google Kubernetes Engine"
msgstr ""
msgid "ClusterIntegration|Create on GKE"
......@@ -551,10 +551,10 @@ msgstr ""
msgid "ClusterIntegration|Google Cloud Platform project ID"
msgstr ""
msgid "ClusterIntegration|Google Container Engine"
msgid "ClusterIntegration|Google Kubernetes Engine"
msgstr ""
msgid "ClusterIntegration|Google Container Engine project"
msgid "ClusterIntegration|Google Kubernetes Engine project"
msgstr ""
msgid "ClusterIntegration|Helm Tiller"
......@@ -638,7 +638,7 @@ msgstr ""
msgid "ClusterIntegration|Remove integration"
msgstr ""
msgid "ClusterIntegration|Removing cluster integration will remove the cluster configuration you have added to this project. It will not delete your cluster on Google Container Engine."
msgid "ClusterIntegration|Removing cluster integration will remove the cluster configuration you have added to this project. It will not delete your cluster on Google Kubernetes Engine."
msgstr ""
msgid "ClusterIntegration|Request to begin installing failed"
......@@ -668,7 +668,7 @@ msgstr ""
msgid "ClusterIntegration|Something went wrong on our end."
msgstr ""
msgid "ClusterIntegration|Something went wrong while creating your cluster on Google Container Engine"
msgid "ClusterIntegration|Something went wrong while creating your cluster on Google Kubernetes Engine"
msgstr ""
msgid "ClusterIntegration|Something went wrong while installing %{title}"
......@@ -689,13 +689,13 @@ msgstr ""
msgid "ClusterIntegration|With a cluster associated to this project, you can use review apps, deploy your applications, run your pipelines, and much more in an easy way."
msgstr ""
msgid "ClusterIntegration|Your account must have %{link_to_container_engine}"
msgid "ClusterIntegration|Your account must have %{link_to_kubernetes_engine}"
msgstr ""
msgid "ClusterIntegration|Zone"
msgstr ""
msgid "ClusterIntegration|access to Google Container Engine"
msgid "ClusterIntegration|access to Google Kubernetes Engine"
msgstr ""
msgid "ClusterIntegration|cluster"
......
locale/it/gitlab.po
......@@ -504,13 +504,13 @@ msgstr ""
msgid "ClusterIntegration|Cluster integration is enabled for this project. Disabling this integration will not affect your cluster, it will only temporarily turn off GitLab's connection to it."
msgstr ""
msgid "ClusterIntegration|Cluster is being created on Google Container Engine..."
msgid "ClusterIntegration|Cluster is being created on Google Kubernetes Engine..."
msgstr ""
msgid "ClusterIntegration|Cluster name"
msgstr ""
msgid "ClusterIntegration|Cluster was successfully created on Google Container Engine"
msgid "ClusterIntegration|Cluster was successfully created on Google Kubernetes Engine"
msgstr ""
msgid "ClusterIntegration|Copy cluster name"
......@@ -519,7 +519,7 @@ msgstr ""
msgid "ClusterIntegration|Create cluster"
msgstr ""
msgid "ClusterIntegration|Create new cluster on Google Container Engine"
msgid "ClusterIntegration|Create new cluster on Google Kubernetes Engine"
msgstr ""
msgid "ClusterIntegration|Enable cluster integration"
......@@ -528,10 +528,10 @@ msgstr ""
msgid "ClusterIntegration|Google Cloud Platform project ID"
msgstr ""
msgid "ClusterIntegration|Google Container Engine"
msgid "ClusterIntegration|Google Kubernetes Engine"
msgstr ""
msgid "ClusterIntegration|Google Container Engine project"
msgid "ClusterIntegration|Google Kubernetes Engine project"
msgstr ""
msgid "ClusterIntegration|Learn more about %{link_to_documentation}"
......@@ -585,7 +585,7 @@ msgstr ""
msgid "ClusterIntegration|Something went wrong on our end."
msgstr ""
msgid "ClusterIntegration|Something went wrong while creating your cluster on Google Container Engine"
msgid "ClusterIntegration|Something went wrong while creating your cluster on Google Kubernetes Engine"
msgstr ""
msgid "ClusterIntegration|Toggle Cluster"
......@@ -594,13 +594,13 @@ msgstr ""
msgid "ClusterIntegration|With a cluster associated to this project, you can use review apps, deploy your applications, run your pipelines, and much more in an easy way."
msgstr ""
msgid "ClusterIntegration|Your account must have %{link_to_container_engine}"
msgid "ClusterIntegration|Your account must have %{link_to_kubernetes_engine}"
msgstr ""
msgid "ClusterIntegration|Zone"
msgstr ""
msgid "ClusterIntegration|access to Google Container Engine"
msgid "ClusterIntegration|access to Google Kubernetes Engine"
msgstr ""
msgid "ClusterIntegration|cluster"
......
locale/ja/gitlab.po
......@@ -497,13 +497,13 @@ msgstr ""
msgid "ClusterIntegration|Cluster integration is enabled for this project. Disabling this integration will not affect your cluster, it will only temporarily turn off GitLab's connection to it."
msgstr ""
msgid "ClusterIntegration|Cluster is being created on Google Container Engine..."
msgid "ClusterIntegration|Cluster is being created on Google Kubernetes Engine..."
msgstr ""
msgid "ClusterIntegration|Cluster name"
msgstr ""
msgid "ClusterIntegration|Cluster was successfully created on Google Container Engine"
msgid "ClusterIntegration|Cluster was successfully created on Google Kubernetes Engine"
msgstr ""
msgid "ClusterIntegration|Copy cluster name"
......@@ -512,7 +512,7 @@ msgstr ""
msgid "ClusterIntegration|Create cluster"
msgstr ""
msgid "ClusterIntegration|Create new cluster on Google Container Engine"
msgid "ClusterIntegration|Create new cluster on Google Kubernetes Engine"
msgstr ""
msgid "ClusterIntegration|Enable cluster integration"
......@@ -521,10 +521,10 @@ msgstr ""
msgid "ClusterIntegration|Google Cloud Platform project ID"
msgstr ""
msgid "ClusterIntegration|Google Container Engine"
msgid "ClusterIntegration|Google Kubernetes Engine"
msgstr ""
msgid "ClusterIntegration|Google Container Engine project"
msgid "ClusterIntegration|Google Kubernetes Engine project"
msgstr ""
msgid "ClusterIntegration|Learn more about %{link_to_documentation}"
......@@ -578,7 +578,7 @@ msgstr ""
msgid "ClusterIntegration|Something went wrong on our end."
msgstr ""
msgid "ClusterIntegration|Something went wrong while creating your cluster on Google Container Engine"
msgid "ClusterIntegration|Something went wrong while creating your cluster on Google Kubernetes Engine"
msgstr ""
msgid "ClusterIntegration|Toggle Cluster"
......@@ -587,13 +587,13 @@ msgstr ""
msgid "ClusterIntegration|With a cluster associated to this project, you can use review apps, deploy your applications, run your pipelines, and much more in an easy way."
msgstr ""
msgid "ClusterIntegration|Your account must have %{link_to_container_engine}"
msgid "ClusterIntegration|Your account must have %{link_to_kubernetes_engine}"
msgstr ""
msgid "ClusterIntegration|Zone"
msgstr ""
msgid "ClusterIntegration|access to Google Container Engine"
msgid "ClusterIntegration|access to Google Kubernetes Engine"
msgstr ""
msgid "ClusterIntegration|cluster"
......
locale/ko/gitlab.po
......@@ -497,13 +497,13 @@ msgstr ""
msgid "ClusterIntegration|Cluster integration is enabled for this project. Disabling this integration will not affect your cluster, it will only temporarily turn off GitLab's connection to it."
msgstr ""
msgid "ClusterIntegration|Cluster is being created on Google Container Engine..."
msgid "ClusterIntegration|Cluster is being created on Google Kubernetes Engine..."
msgstr ""
msgid "ClusterIntegration|Cluster name"
msgstr ""
msgid "ClusterIntegration|Cluster was successfully created on Google Container Engine"
msgid "ClusterIntegration|Cluster was successfully created on Google Kubernetes Engine"
msgstr ""
msgid "ClusterIntegration|Copy cluster name"
......@@ -512,7 +512,7 @@ msgstr ""
msgid "ClusterIntegration|Create cluster"
msgstr ""
msgid "ClusterIntegration|Create new cluster on Google Container Engine"
msgid "ClusterIntegration|Create new cluster on Google Kubernetes Engine"
msgstr ""
msgid "ClusterIntegration|Enable cluster integration"
......@@ -521,10 +521,10 @@ msgstr ""
msgid "ClusterIntegration|Google Cloud Platform project ID"
msgstr ""
msgid "ClusterIntegration|Google Container Engine"
msgid "ClusterIntegration|Google Kubernetes Engine"
msgstr ""
msgid "ClusterIntegration|Google Container Engine project"
msgid "ClusterIntegration|Google Kubernetes Engine project"
msgstr ""
msgid "ClusterIntegration|Learn more about %{link_to_documentation}"
......@@ -578,7 +578,7 @@ msgstr ""
msgid "ClusterIntegration|Something went wrong on our end."
msgstr ""
msgid "ClusterIntegration|Something went wrong while creating your cluster on Google Container Engine"
msgid "ClusterIntegration|Something went wrong while creating your cluster on Google Kubernetes Engine"
msgstr ""
msgid "ClusterIntegration|Toggle Cluster"
......@@ -587,13 +587,13 @@ msgstr ""
msgid "ClusterIntegration|With a cluster associated to this project, you can use review apps, deploy your applications, run your pipelines, and much more in an easy way."
msgstr ""
msgid "ClusterIntegration|Your account must have %{link_to_container_engine}"
msgid "ClusterIntegration|Your account must have %{link_to_kubernetes_engine}"
msgstr ""
msgid "ClusterIntegration|Zone"
msgstr ""
msgid "ClusterIntegration|access to Google Container Engine"
msgid "ClusterIntegration|access to Google Kubernetes Engine"
msgstr ""
msgid "ClusterIntegration|cluster"
......
locale/nl_NL/gitlab.po
......@@ -504,13 +504,13 @@ msgstr ""
msgid "ClusterIntegration|Cluster integration is enabled for this project. Disabling this integration will not affect your cluster, it will only temporarily turn off GitLab's connection to it."
msgstr ""
msgid "ClusterIntegration|Cluster is being created on Google Container Engine..."
msgid "ClusterIntegration|Cluster is being created on Google Kubernetes Engine..."
msgstr ""
msgid "ClusterIntegration|Cluster name"
msgstr ""
msgid "ClusterIntegration|Cluster was successfully created on Google Container Engine"
msgid "ClusterIntegration|Cluster was successfully created on Google Kubernetes Engine"
msgstr ""
msgid "ClusterIntegration|Copy cluster name"
......@@ -519,7 +519,7 @@ msgstr ""
msgid "ClusterIntegration|Create cluster"
msgstr ""
msgid "ClusterIntegration|Create new cluster on Google Container Engine"
msgid "ClusterIntegration|Create new cluster on Google Kubernetes Engine"
msgstr ""
msgid "ClusterIntegration|Enable cluster integration"
......@@ -528,10 +528,10 @@ msgstr ""
msgid "ClusterIntegration|Google Cloud Platform project ID"
msgstr ""
msgid "ClusterIntegration|Google Container Engine"
msgid "ClusterIntegration|Google Kubernetes Engine"
msgstr ""
msgid "ClusterIntegration|Google Container Engine project"
msgid "ClusterIntegration|Google Kubernetes Engine project"
msgstr ""
msgid "ClusterIntegration|Learn more about %{link_to_documentation}"
......@@ -585,7 +585,7 @@ msgstr ""
msgid "ClusterIntegration|Something went wrong on our end."
msgstr ""
msgid "ClusterIntegration|Something went wrong while creating your cluster on Google Container Engine"
msgid "ClusterIntegration|Something went wrong while creating your cluster on Google Kubernetes Engine"
msgstr ""
msgid "ClusterIntegration|Toggle Cluster"
......@@ -594,13 +594,13 @@ msgstr ""
msgid "ClusterIntegration|With a cluster associated to this project, you can use review apps, deploy your applications, run your pipelines, and much more in an easy way."
msgstr ""
msgid "ClusterIntegration|Your account must have %{link_to_container_engine}"
msgid "ClusterIntegration|Your account must have %{link_to_kubernetes_engine}"
msgstr ""
msgid "ClusterIntegration|Zone"
msgstr ""
msgid "ClusterIntegration|access to Google Container Engine"
msgid "ClusterIntegration|access to Google Kubernetes Engine"
msgstr ""
msgid "ClusterIntegration|cluster"
......
locale/pl_PL/gitlab.po
......@@ -511,13 +511,13 @@ msgstr ""
msgid "ClusterIntegration|Cluster integration is enabled for this project. Disabling this integration will not affect your cluster, it will only temporarily turn off GitLab's connection to it."
msgstr ""
msgid "ClusterIntegration|Cluster is being created on Google Container Engine..."
msgid "ClusterIntegration|Cluster is being created on Google Kubernetes Engine..."
msgstr ""
msgid "ClusterIntegration|Cluster name"
msgstr ""
msgid "ClusterIntegration|Cluster was successfully created on Google Container Engine"
msgid "ClusterIntegration|Cluster was successfully created on Google Kubernetes Engine"
msgstr ""
msgid "ClusterIntegration|Copy cluster name"
......@@ -526,7 +526,7 @@ msgstr ""
msgid "ClusterIntegration|Create cluster"
msgstr ""
msgid "ClusterIntegration|Create new cluster on Google Container Engine"
msgid "ClusterIntegration|Create new cluster on Google Kubernetes Engine"
msgstr ""
msgid "ClusterIntegration|Enable cluster integration"
......@@ -535,10 +535,10 @@ msgstr ""
msgid "ClusterIntegration|Google Cloud Platform project ID"
msgstr ""
msgid "ClusterIntegration|Google Container Engine"
msgid "ClusterIntegration|Google Kubernetes Engine"
msgstr ""
msgid "ClusterIntegration|Google Container Engine project"
msgid "ClusterIntegration|Google Kubernetes Engine project"
msgstr ""
msgid "ClusterIntegration|Learn more about %{link_to_documentation}"
......@@ -592,7 +592,7 @@ msgstr ""
msgid "ClusterIntegration|Something went wrong on our end."
msgstr ""
msgid "ClusterIntegration|Something went wrong while creating your cluster on Google Container Engine"
msgid "ClusterIntegration|Something went wrong while creating your cluster on Google Kubernetes Engine"
msgstr ""
msgid "ClusterIntegration|Toggle Cluster"
......@@ -601,13 +601,13 @@ msgstr ""
msgid "ClusterIntegration|With a cluster associated to this project, you can use review apps, deploy your applications, run your pipelines, and much more in an easy way."
msgstr ""
msgid "ClusterIntegration|Your account must have %{link_to_container_engine}"
msgid "ClusterIntegration|Your account must have %{link_to_kubernetes_engine}"
msgstr ""
msgid "ClusterIntegration|Zone"
msgstr ""
msgid "ClusterIntegration|access to Google Container Engine"
msgid "ClusterIntegration|access to Google Kubernetes Engine"
msgstr ""
msgid "ClusterIntegration|cluster"
......
locale/pt_BR/gitlab.po
......@@ -504,14 +504,14 @@ msgstr "Integração do cluster está ativada nesse projeto."
msgid "ClusterIntegration|Cluster integration is enabled for this project. Disabling this integration will not affect your cluster, it will only temporarily turn off GitLab's connection to it."
msgstr "Integração do cluster está ativada para esse projeto. Desabilitar a integração não afetará seu cluster, mas desligará temporariamente a conexão do Gitlab com ele."
msgid "ClusterIntegration|Cluster is being created on Google Container Engine..."
msgstr "O cluster está sendo criado no Google Container Engine..."
msgid "ClusterIntegration|Cluster is being created on Google Kubernetes Engine..."
msgstr "O cluster está sendo criado no Google Kubernetes Engine..."
msgid "ClusterIntegration|Cluster name"
msgstr "Nome do cluster"
msgid "ClusterIntegration|Cluster was successfully created on Google Container Engine"
msgstr "O cluster foi criado com sucesso no Google Container Engine"
msgid "ClusterIntegration|Cluster was successfully created on Google Kubernetes Engine"
msgstr "O cluster foi criado com sucesso no Google Kubernetes Engine"
msgid "ClusterIntegration|Copy cluster name"
msgstr "Copiar nome do cluster"
......@@ -519,8 +519,8 @@ msgstr "Copiar nome do cluster"
msgid "ClusterIntegration|Create cluster"
msgstr "Criar cluster"
msgid "ClusterIntegration|Create new cluster on Google Container Engine"
msgstr "Criar novo cluster no Google Container Engine"
msgid "ClusterIntegration|Create new cluster on Google Kubernetes Engine"
msgstr "Criar novo cluster no Google Kubernetes Engine"
msgid "ClusterIntegration|Enable cluster integration"
msgstr "Ativar integração com o cluster"
......@@ -528,11 +528,11 @@ msgstr "Ativar integração com o cluster"
msgid "ClusterIntegration|Google Cloud Platform project ID"
msgstr "ID do projeto no Google Cloud Platform"
msgid "ClusterIntegration|Google Container Engine"
msgstr "Google Container Engine"
msgid "ClusterIntegration|Google Kubernetes Engine"
msgstr "Google Kubernetes Engine"
msgid "ClusterIntegration|Google Container Engine project"
msgstr "Projeto no Google Container Engine"
msgid "ClusterIntegration|Google Kubernetes Engine project"
msgstr "Projeto no Google Kubernetes Engine"
msgid "ClusterIntegration|Learn more about %{link_to_documentation}"
msgstr "Leia mais sobre %{link_to_documentation}"
......@@ -585,8 +585,8 @@ msgstr "Ver zonas"
msgid "ClusterIntegration|Something went wrong on our end."
msgstr "Alguma coisa deu errado do nosso lado."
msgid "ClusterIntegration|Something went wrong while creating your cluster on Google Container Engine"
msgstr "Algo deu errado ao criar seu cluster no Google Container Engine"
msgid "ClusterIntegration|Something went wrong while creating your cluster on Google Kubernetes Engine"
msgstr "Algo deu errado ao criar seu cluster no Google Kubernetes Engine"
msgid "ClusterIntegration|Toggle Cluster"
msgstr "Alternar cluster"
......@@ -594,14 +594,14 @@ msgstr "Alternar cluster"
msgid "ClusterIntegration|With a cluster associated to this project, you can use review apps, deploy your applications, run your pipelines, and much more in an easy way."
msgstr "Com um cluster associado à esse projeto, você pode usar revisão de apps, fazer deploy de suas aplicações, rodar suas pipelines e muito mais de um jeito simples."
msgid "ClusterIntegration|Your account must have %{link_to_container_engine}"
msgstr "Sua conta precisa ter %{link_to_container_engine}"
msgid "ClusterIntegration|Your account must have %{link_to_kubernetes_engine}"
msgstr "Sua conta precisa ter %{link_to_kubernetes_engine}"
msgid "ClusterIntegration|Zone"
msgstr "Zona"
msgid "ClusterIntegration|access to Google Container Engine"
msgstr "Acesso ao Google Container Engine"
msgid "ClusterIntegration|access to Google Kubernetes Engine"
msgstr "Acesso ao Google Kubernetes Engine"
msgid "ClusterIntegration|cluster"
msgstr "cluster"
......
locale/ru/gitlab.po
......@@ -511,14 +511,14 @@ msgstr "Интеграция кластеров включена для этог
msgid "ClusterIntegration|Cluster integration is enabled for this project. Disabling this integration will not affect your cluster, it will only temporarily turn off GitLab's connection to it."
msgstr "Для этого проекта включена интеграция кластеров. Отключение интеграции не повлияет на кластер, но соединение с GitLab будет временно отключено."
msgid "ClusterIntegration|Cluster is being created on Google Container Engine..."
msgstr "Создается кластер в Google Container Engine..."
msgid "ClusterIntegration|Cluster is being created on Google Kubernetes Engine..."
msgstr "Создается кластер в Google Kubernetes Engine..."
msgid "ClusterIntegration|Cluster name"
msgstr "Название кластера"
msgid "ClusterIntegration|Cluster was successfully created on Google Container Engine"
msgstr "Кластер был успешно создан в Google Container Engine"
msgid "ClusterIntegration|Cluster was successfully created on Google Kubernetes Engine"
msgstr "Кластер был успешно создан в Google Kubernetes Engine"
msgid "ClusterIntegration|Copy cluster name"
msgstr "Копировать название кластера"
......@@ -526,8 +526,8 @@ msgstr "Копировать название кластера"
msgid "ClusterIntegration|Create cluster"
msgstr "Создать кластер"
msgid "ClusterIntegration|Create new cluster on Google Container Engine"
msgstr "Создать новый кластер в Google Container Engine"
msgid "ClusterIntegration|Create new cluster on Google Kubernetes Engine"
msgstr "Создать новый кластер в Google Kubernetes Engine"
msgid "ClusterIntegration|Enable cluster integration"
msgstr "Включить интеграцию с кластерами"
......@@ -535,11 +535,11 @@ msgstr "Включить интеграцию с кластерами"
msgid "ClusterIntegration|Google Cloud Platform project ID"
msgstr "Идентификатор проекта в Google Cloud Platform"
msgid "ClusterIntegration|Google Container Engine"
msgstr "Google Container Engine"
msgid "ClusterIntegration|Google Kubernetes Engine"
msgstr "Google Kubernetes Engine"
msgid "ClusterIntegration|Google Container Engine project"
msgstr "Проект Google Container Engine"
msgid "ClusterIntegration|Google Kubernetes Engine project"
msgstr "Проект Google Kubernetes Engine"
msgid "ClusterIntegration|Learn more about %{link_to_documentation}"
msgstr "Узнайте больше на %{link_to_documentation}"
......@@ -592,8 +592,8 @@ msgstr "См. зоны"
msgid "ClusterIntegration|Something went wrong on our end."
msgstr " У нас что-то пошло не так."
msgid "ClusterIntegration|Something went wrong while creating your cluster on Google Container Engine"
msgstr "Что-то пошло не так во время создания кластера в Google Container Engine"
msgid "ClusterIntegration|Something went wrong while creating your cluster on Google Kubernetes Engine"
msgstr "Что-то пошло не так во время создания кластера в Google Kubernetes Engine"
msgid "ClusterIntegration|Toggle Cluster"
msgstr "Переключить Кластер"
......@@ -601,14 +601,14 @@ msgstr "Переключить Кластер"
msgid "ClusterIntegration|With a cluster associated to this project, you can use review apps, deploy your applications, run your pipelines, and much more in an easy way."
msgstr "Если привязать кластер к этому проекту, вы с лёгкостью сможете использовать приложения для ревью, развертывать ваши приложения, запускать сборочные линии и многое другое."
msgid "ClusterIntegration|Your account must have %{link_to_container_engine}"
msgstr "Ваша учетная запись должна иметь %{link_to_container_engine}"
msgid "ClusterIntegration|Your account must have %{link_to_kubernetes_engine}"
msgstr "Ваша учетная запись должна иметь %{link_to_kubernetes_engine}"
msgid "ClusterIntegration|Zone"
msgstr "Зона"
msgid "ClusterIntegration|access to Google Container Engine"
msgstr "доступ к Google Container Engine"
msgid "ClusterIntegration|access to Google Kubernetes Engine"
msgstr "доступ к Google Kubernetes Engine"
msgid "ClusterIntegration|cluster"
msgstr "кластер"
......
locale/uk/gitlab.po
......@@ -511,14 +511,14 @@ msgstr "Інтеграція із кластером увімкнена для
msgid "ClusterIntegration|Cluster integration is enabled for this project. Disabling this integration will not affect your cluster, it will only temporarily turn off GitLab's connection to it."
msgstr "Для цього проекту увімкнена інтеграція із кластером. Викнення інтеграції не вплине на кластер, але з'єднання GitLab з ним буде тимчасово розірване."
msgid "ClusterIntegration|Cluster is being created on Google Container Engine..."
msgstr "Створюється кластер в Google Container Engine..."
msgid "ClusterIntegration|Cluster is being created on Google Kubernetes Engine..."
msgstr "Створюється кластер в Google Kubernetes Engine..."
msgid "ClusterIntegration|Cluster name"
msgstr "Ім'я кластера"
msgid "ClusterIntegration|Cluster was successfully created on Google Container Engine"
msgstr "Кластер був успішно створений в Google Container Engine"
msgid "ClusterIntegration|Cluster was successfully created on Google Kubernetes Engine"
msgstr "Кластер був успішно створений в Google Kubernetes Engine"
msgid "ClusterIntegration|Copy cluster name"
msgstr "Копіювати назву кластера"
......@@ -526,8 +526,8 @@ msgstr "Копіювати назву кластера"
msgid "ClusterIntegration|Create cluster"
msgstr "Створити кластер"
msgid "ClusterIntegration|Create new cluster on Google Container Engine"
msgstr "Створити новий кластер в Google Container Engine"
msgid "ClusterIntegration|Create new cluster on Google Kubernetes Engine"
msgstr "Створити новий кластер в Google Kubernetes Engine"
msgid "ClusterIntegration|Enable cluster integration"
msgstr "Увімкнути інтеграцію із кластерами"
......@@ -535,11 +535,11 @@ msgstr "Увімкнути інтеграцію із кластерами"
msgid "ClusterIntegration|Google Cloud Platform project ID"
msgstr "Ідентифікатор проекту в Google Cloud Platform"
msgid "ClusterIntegration|Google Container Engine"
msgstr "Google Container Engine"
msgid "ClusterIntegration|Google Kubernetes Engine"
msgstr "Google Kubernetes Engine"
msgid "ClusterIntegration|Google Container Engine project"
msgstr "Проект Google Container Engine"
msgid "ClusterIntegration|Google Kubernetes Engine project"
msgstr "Проект Google Kubernetes Engine"
msgid "ClusterIntegration|Learn more about %{link_to_documentation}"
msgstr "Дізнайтеся більше про %{link_to_documentation}"
......@@ -592,8 +592,8 @@ msgstr "Переглянути зони"
msgid "ClusterIntegration|Something went wrong on our end."
msgstr "Щось пішло не так з нашого боку."
msgid "ClusterIntegration|Something went wrong while creating your cluster on Google Container Engine"
msgstr "Щось пішло не так під час створення кластера в Google Container Engine"
msgid "ClusterIntegration|Something went wrong while creating your cluster on Google Kubernetes Engine"
msgstr "Щось пішло не так під час створення кластера в Google Kubernetes Engine"
msgid "ClusterIntegration|Toggle Cluster"
msgstr "Переключити Кластер"
......@@ -601,14 +601,14 @@ msgstr "Переключити Кластер"
msgid "ClusterIntegration|With a cluster associated to this project, you can use review apps, deploy your applications, run your pipelines, and much more in an easy way."
msgstr "За допомогою підключеного до цього проекту кластера, ви можете використовувати Review Apps, розгортати ваші проекти, запускати конвеєри збірки та багато іншого."
msgid "ClusterIntegration|Your account must have %{link_to_container_engine}"
msgstr "Ваш обліковий запис повинен мати %{link_to_container_engine}"
msgid "ClusterIntegration|Your account must have %{link_to_kubernetes_engine}"
msgstr "Ваш обліковий запис повинен мати %{link_to_kubernetes_engine}"
msgid "ClusterIntegration|Zone"
msgstr "Зона"
msgid "ClusterIntegration|access to Google Container Engine"
msgstr "доступ до Google Container Engine"
msgid "ClusterIntegration|access to Google Kubernetes Engine"
msgstr "доступ до Google Kubernetes Engine"
msgid "ClusterIntegration|cluster"
msgstr "кластер"
......
locale/zh_CN/gitlab.po
......@@ -497,14 +497,14 @@ msgstr "此项目已启用集群集成。"
msgid "ClusterIntegration|Cluster integration is enabled for this project. Disabling this integration will not affect your cluster, it will only temporarily turn off GitLab's connection to it."
msgstr "此项目已启用集群集成。禁用此集成不会影响您的集群，它只会暂时关闭 GitLab 的连接。"
msgid "ClusterIntegration|Cluster is being created on Google Container Engine..."
msgstr "集群正在 Google Container Engine 上创建..."
msgid "ClusterIntegration|Cluster is being created on Google Kubernetes Engine..."
msgstr "集群正在 Google Kubernetes Engine 上创建..."
msgid "ClusterIntegration|Cluster name"
msgstr "集群名称"
msgid "ClusterIntegration|Cluster was successfully created on Google Container Engine"
msgstr "集群已在 Google Container Engine 上成功创建"
msgid "ClusterIntegration|Cluster was successfully created on Google Kubernetes Engine"
msgstr "集群已在 Google Kubernetes Engine 上成功创建"
msgid "ClusterIntegration|Copy cluster name"
msgstr "复制集群名称"
......@@ -512,8 +512,8 @@ msgstr "复制集群名称"
msgid "ClusterIntegration|Create cluster"
msgstr "创建集群"
msgid "ClusterIntegration|Create new cluster on Google Container Engine"
msgstr "在 Google Container Engine 上创建新集群"
msgid "ClusterIntegration|Create new cluster on Google Kubernetes Engine"
msgstr "在 Google Kubernetes Engine 上创建新集群"
msgid "ClusterIntegration|Enable cluster integration"
msgstr "启用集群集成"
......@@ -521,11 +521,11 @@ msgstr "启用集群集成"
msgid "ClusterIntegration|Google Cloud Platform project ID"
msgstr "Google 云平台项目ID"
msgid "ClusterIntegration|Google Container Engine"
msgstr "Google Container Engine"
msgid "ClusterIntegration|Google Kubernetes Engine"
msgstr "Google Kubernetes Engine"
msgid "ClusterIntegration|Google Container Engine project"
msgstr "Google Container Engine 项目"
msgid "ClusterIntegration|Google Kubernetes Engine project"
msgstr "Google Kubernetes Engine 项目"
msgid "ClusterIntegration|Learn more about %{link_to_documentation}"
msgstr "了解详细%{link_to_documentation}"
......@@ -578,8 +578,8 @@ msgstr "查看区域"
msgid "ClusterIntegration|Something went wrong on our end."
msgstr "发生了内部错误"
msgid "ClusterIntegration|Something went wrong while creating your cluster on Google Container Engine"
msgstr "在 Google Container Engine 上创建集群时发生错误"
msgid "ClusterIntegration|Something went wrong while creating your cluster on Google Kubernetes Engine"
msgstr "在 Google Kubernetes Engine 上创建集群时发生错误"
msgid "ClusterIntegration|Toggle Cluster"
msgstr "切换集群"
......@@ -587,14 +587,14 @@ msgstr "切换集群"
msgid "ClusterIntegration|With a cluster associated to this project, you can use review apps, deploy your applications, run your pipelines, and much more in an easy way."
msgstr "使用与此项目关联的集群，您可以使用审阅应用程序，部署应用程序，运行流水线等等。"
msgid "ClusterIntegration|Your account must have %{link_to_container_engine}"
msgstr "您的帐户必须有%{link_to_container_engine}"
msgid "ClusterIntegration|Your account must have %{link_to_kubernetes_engine}"
msgstr "您的帐户必须有%{link_to_kubernetes_engine}"
msgid "ClusterIntegration|Zone"
msgstr "区域"
msgid "ClusterIntegration|access to Google Container Engine"
msgstr "访问 Google Container Engine"
msgid "ClusterIntegration|access to Google Kubernetes Engine"
msgstr "访问 Google Kubernetes Engine"
msgid "ClusterIntegration|cluster"
msgstr "集群"
......
locale/zh_HK/gitlab.po
......@@ -497,13 +497,13 @@ msgstr ""
msgid "ClusterIntegration|Cluster integration is enabled for this project. Disabling this integration will not affect your cluster, it will only temporarily turn off GitLab's connection to it."
msgstr ""
msgid "ClusterIntegration|Cluster is being created on Google Container Engine..."
msgid "ClusterIntegration|Cluster is being created on Google Kubernetes Engine..."
msgstr ""
msgid "ClusterIntegration|Cluster name"
msgstr ""
msgid "ClusterIntegration|Cluster was successfully created on Google Container Engine"
msgid "ClusterIntegration|Cluster was successfully created on Google Kubernetes Engine"
msgstr ""
msgid "ClusterIntegration|Copy cluster name"
......@@ -512,7 +512,7 @@ msgstr ""
msgid "ClusterIntegration|Create cluster"
msgstr ""
msgid "ClusterIntegration|Create new cluster on Google Container Engine"
msgid "ClusterIntegration|Create new cluster on Google Kubernetes Engine"
msgstr ""
msgid "ClusterIntegration|Enable cluster integration"
......@@ -521,10 +521,10 @@ msgstr ""
msgid "ClusterIntegration|Google Cloud Platform project ID"
msgstr ""
msgid "ClusterIntegration|Google Container Engine"
msgid "ClusterIntegration|Google Kubernetes Engine"
msgstr ""
msgid "ClusterIntegration|Google Container Engine project"
msgid "ClusterIntegration|Google Kubernetes Engine project"
msgstr ""
msgid "ClusterIntegration|Learn more about %{link_to_documentation}"
......@@ -578,7 +578,7 @@ msgstr ""
msgid "ClusterIntegration|Something went wrong on our end."
msgstr ""
msgid "ClusterIntegration|Something went wrong while creating your cluster on Google Container Engine"
msgid "ClusterIntegration|Something went wrong while creating your cluster on Google Kubernetes Engine"
msgstr ""
msgid "ClusterIntegration|Toggle Cluster"
......@@ -587,13 +587,13 @@ msgstr ""
msgid "ClusterIntegration|With a cluster associated to this project, you can use review apps, deploy your applications, run your pipelines, and much more in an easy way."
msgstr ""
msgid "ClusterIntegration|Your account must have %{link_to_container_engine}"
msgid "ClusterIntegration|Your account must have %{link_to_kubernetes_engine}"
msgstr ""
msgid "ClusterIntegration|Zone"
msgstr ""
msgid "ClusterIntegration|access to Google Container Engine"
msgid "ClusterIntegration|access to Google Kubernetes Engine"
msgstr ""
msgid "ClusterIntegration|cluster"
......
locale/zh_TW/gitlab.po
......@@ -497,13 +497,13 @@ msgstr "此專案已經啟用叢集整合"
msgid "ClusterIntegration|Cluster integration is enabled for this project. Disabling this integration will not affect your cluster, it will only temporarily turn off GitLab's connection to it."
msgstr "此專案已啟用叢集整合。禁止叢集整合不會影響您的叢集，它只是暫時關閉 GitLab 的連接。"
msgid "ClusterIntegration|Cluster is being created on Google Container Engine..."
msgid "ClusterIntegration|Cluster is being created on Google Kubernetes Engine..."
msgstr "在 Google 容器引擎中建立新的叢集"
msgid "ClusterIntegration|Cluster name"
msgstr "叢集名稱"
msgid "ClusterIntegration|Cluster was successfully created on Google Container Engine"
msgid "ClusterIntegration|Cluster was successfully created on Google Kubernetes Engine"
msgstr "在 Google 容器引擎上成功建立叢集"
msgid "ClusterIntegration|Copy cluster name"
......@@ -512,7 +512,7 @@ msgstr "複製叢集名稱"
msgid "ClusterIntegration|Create cluster"
msgstr "建立叢集"
msgid "ClusterIntegration|Create new cluster on Google Container Engine"
msgid "ClusterIntegration|Create new cluster on Google Kubernetes Engine"
msgstr "在 Google 容器引擎中建立新的叢集"
msgid "ClusterIntegration|Enable cluster integration"
......@@ -521,10 +521,10 @@ msgstr "啟動叢集整合"
msgid "ClusterIntegration|Google Cloud Platform project ID"
msgstr "Google 雲端專案 ID"
msgid "ClusterIntegration|Google Container Engine"
msgid "ClusterIntegration|Google Kubernetes Engine"
msgstr "Google 容器引擎"
msgid "ClusterIntegration|Google Container Engine project"
msgid "ClusterIntegration|Google Kubernetes Engine project"
msgstr "Google 容器引擎專案"
msgid "ClusterIntegration|Learn more about %{link_to_documentation}"
......@@ -578,8 +578,8 @@ msgstr "查看區域"
msgid "ClusterIntegration|Something went wrong on our end."
msgstr "內部發生了錯誤"
msgid "ClusterIntegration|Something went wrong while creating your cluster on Google Container Engine"
msgstr "在 Google Container Engine 上建立叢集時發生了錯誤"
msgid "ClusterIntegration|Something went wrong while creating your cluster on Google Kubernetes Engine"
msgstr "在 Google Kubernetes Engine 上建立叢集時發生了錯誤"
msgid "ClusterIntegration|Toggle Cluster"
msgstr "叢集開關"
......@@ -587,14 +587,14 @@ msgstr "叢集開關"
msgid "ClusterIntegration|With a cluster associated to this project, you can use review apps, deploy your applications, run your pipelines, and much more in an easy way."
msgstr "當叢集連結到此專案，你可以使用複閱應用 (review apps)，部署你的應用程式，執行你的流水線 (pipelines)，還有更多容易上手的方式可以使用。"
msgid "ClusterIntegration|Your account must have %{link_to_container_engine}"
msgstr "您的帳號必須有 %{link_to_container_engine}"
msgid "ClusterIntegration|Your account must have %{link_to_kubernetes_engine}"
msgstr "您的帳號必須有 %{link_to_kubernetes_engine}"
msgid "ClusterIntegration|Zone"
msgstr "區域"
msgid "ClusterIntegration|access to Google Container Engine"
msgstr "存取 Google Container Engine"
msgid "ClusterIntegration|access to Google Kubernetes Engine"
msgstr "存取 Google Kubernetes Engine"
msgid "ClusterIntegration|cluster"
msgstr "叢集"
......
spec/features/projects/clusters/gcp_spec.rb
......@@ -46,15 +46,15 @@ feature 'Gcp Cluster', :js do
end
it 'user sees a cluster details page and creation status' do
expect(page).to have_content('Cluster is being created on Google Container Engine...')
expect(page).to have_content('Cluster is being created on Google Kubernetes Engine...')
Clusters::Cluster.last.provider.make_created!
expect(page).to have_content('Cluster was successfully created on Google Container Engine')
expect(page).to have_content('Cluster was successfully created on Google Kubernetes Engine')
end
it 'user sees a error if something worng during creation' do
expect(page).to have_content('Cluster is being created on Google Container Engine...')
expect(page).to have_content('Cluster is being created on Google Kubernetes Engine...')
Clusters::Cluster.last.provider.make_errored!('Something wrong!')
......
spec/support/google_api/cloud_platform_helpers.rb
......@@ -63,7 +63,7 @@ module GoogleApi
##
# gcloud container clusters create
# https://cloud.google.com/container-engine/reference/rest/v1/projects.zones.clusters/create
# https://cloud.google.com/kubernetes-engine/docs/reference/rest/v1/projects.zones.clusters/create
# rubocop:disable Metrics/CyclomaticComplexity
# rubocop:disable Metrics/PerceivedComplexity
def cloud_platform_cluster_body(**options)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment