diff options
| author | Phil Hughes <me@iamphill.com> | 2018-02-06 18:57:48 +0300 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2018-02-06 18:57:48 +0300 |
| commit | ba62493009c2360018709b660956a6173f3e1515 (patch) | |
| tree | 623ba15e0bb0a07f1483b38ca8e10ec41d702a14 /app/services | |
| parent | 805799b71b059b1bfb3578c4e78db3030ec04b6a (diff) | |
| parent | 0ecd759d73abaee5c08adbd8ab3db651c2522b14 (diff) | |
Merge branch 'winh-kubernetes-clusters' into 'master'
Replace "cluster" with "Kubernetes cluster"
Closes #41963
See merge request gitlab-org/gitlab-ce!16778
Diffstat (limited to 'app/services')
| -rw-r--r-- | app/services/clusters/create_service.rb | 2 | ||||
| -rw-r--r-- | app/services/clusters/gcp/verify_provision_status_service.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/services/clusters/create_service.rb b/app/services/clusters/create_service.rb index 0471b0f17a2..418888e3293 100644 --- a/app/services/clusters/create_service.rb +++ b/app/services/clusters/create_service.rb @@ -5,7 +5,7 @@ module Clusters def execute(access_token = nil) @access_token = access_token - raise ArgumentError.new('Instance does not support multiple clusters') unless can_create_cluster? + raise ArgumentError.new(_('Instance does not support multiple Kubernetes clusters')) unless can_create_cluster? create_cluster.tap do |cluster| ClusterProvisionWorker.perform_async(cluster.id) if cluster.persisted? diff --git a/app/services/clusters/gcp/verify_provision_status_service.rb b/app/services/clusters/gcp/verify_provision_status_service.rb index bc33756f27c..f994aacd086 100644 --- a/app/services/clusters/gcp/verify_provision_status_service.rb +++ b/app/services/clusters/gcp/verify_provision_status_service.rb @@ -28,7 +28,7 @@ module Clusters if elapsed_time_from_creation(operation) < TIMEOUT WaitForClusterCreationWorker.perform_in(EAGER_INTERVAL, provider.cluster_id) else - provider.make_errored!("Cluster creation time exceeds timeout; #{TIMEOUT}") + provider.make_errored!(_('Kubernetes cluster creation time exceeds timeout; %{timeout}') % { timeout: TIMEOUT }) end end |