diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2017-11-07 15:52:20 +0300 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2017-11-07 15:52:20 +0300 |
| commit | 5c136f1d717b037ed8a5c88273ed3ed760b0f1d3 (patch) | |
| tree | 98764c888743911a5b9c90ebbb9d6cbe14e62f25 /app | |
| parent | 666ab4882f2c6d385c04afe269ddf5b11f795b19 (diff) | |
| parent | 8d7fbd09dc2da152c0377ff4f50e72ba084d60a3 (diff) | |
Merge branch '39649-change-default-size-for-gke-cluster-creation' into 'master'
Resolve "Change default size for GKE cluster creation"
Closes #39649
See merge request gitlab-org/gitlab-ce!15220
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/clusters/providers/gcp.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/clusters/providers/gcp.rb b/app/models/clusters/providers/gcp.rb index c4391729dd7..ee2e43ee9dd 100644 --- a/app/models/clusters/providers/gcp.rb +++ b/app/models/clusters/providers/gcp.rb @@ -7,7 +7,7 @@ module Clusters default_value_for :zone, 'us-central1-a' default_value_for :num_nodes, 3 - default_value_for :machine_type, 'n1-standard-4' + default_value_for :machine_type, 'n1-standard-2' attr_encrypted :access_token, mode: :per_attribute_iv, diff --git a/app/views/projects/clusters/_form.html.haml b/app/views/projects/clusters/_form.html.haml index d8e5b55bb88..1f8ae463d0f 100644 --- a/app/views/projects/clusters/_form.html.haml +++ b/app/views/projects/clusters/_form.html.haml @@ -29,7 +29,7 @@ .form-group = provider_gcp_field.label :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') - = provider_gcp_field.text_field :machine_type, class: 'form-control', placeholder: 'n1-standard-4' + = provider_gcp_field.text_field :machine_type, class: 'form-control', placeholder: 'n1-standard-2' .form-group = field.submit s_('ClusterIntegration|Create cluster'), class: 'btn btn-save' |