diff options
| author | bikebilly <fabio@gitlab.com> | 2017-11-06 15:04:15 +0100 |
|---|---|---|
| committer | bikebilly <fabio@gitlab.com> | 2017-11-06 15:04:15 +0100 |
| commit | fa8c3159da3fe88b92ac8065e30cf43acf955de6 (patch) | |
| tree | d27d524d6b1844f0ecb0a9c85de7f638e561ab9a /app | |
| parent | cfc932cad10b1d6c494222e9d91aa75583b56145 (diff) | |
| download | gitlab-ce-fa8c3159da3fe88b92ac8065e30cf43acf955de6.tar.gz | |
Change default cluster size to n1-standard-2
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/gcp/cluster.rb | 2 | ||||
| -rw-r--r-- | app/views/projects/clusters/_form.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/models/gcp/cluster.rb b/app/models/gcp/cluster.rb index 162a690c0e3..f7842376e2e 100644 --- a/app/models/gcp/cluster.rb +++ b/app/models/gcp/cluster.rb @@ -12,7 +12,7 @@ module Gcp default_value_for :gcp_cluster_zone, 'us-central1-a' default_value_for :gcp_cluster_size, 3 - default_value_for :gcp_machine_type, 'n1-standard-4' + default_value_for :gcp_machine_type, 'n1-standard-2' attr_encrypted :password, mode: :per_attribute_iv, diff --git a/app/views/projects/clusters/_form.html.haml b/app/views/projects/clusters/_form.html.haml index 371cdb1e403..dc878fa188d 100644 --- a/app/views/projects/clusters/_form.html.haml +++ b/app/views/projects/clusters/_form.html.haml @@ -27,7 +27,7 @@ .form-group = field.label :gcp_machine_type, s_('ClusterIntegration|Machine type') = link_to(s_('ClusterIntegration|See machine types'), 'https://cloud.google.com/compute/docs/machine-types', target: '_blank', rel: 'noopener noreferrer') - = field.text_field :gcp_machine_type, class: 'form-control', placeholder: 'n1-standard-4' + = field.text_field :gcp_machine_type, class: 'form-control', placeholder: 'n1-standard-2' .form-group = field.label :project_namespace, s_('ClusterIntegration|Project namespace (optional, unique)') |