diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2017-11-07 12:52:20 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2017-11-07 12:52:20 +0000 |
| commit | 5c136f1d717b037ed8a5c88273ed3ed760b0f1d3 (patch) | |
| tree | 98764c888743911a5b9c90ebbb9d6cbe14e62f25 | |
| parent | 666ab4882f2c6d385c04afe269ddf5b11f795b19 (diff) | |
| parent | 8d7fbd09dc2da152c0377ff4f50e72ba084d60a3 (diff) | |
| download | gitlab-ce-5c136f1d717b037ed8a5c88273ed3ed760b0f1d3.tar.gz | |
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
5 files changed, 9 insertions, 4 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' diff --git a/changelogs/unreleased/39649-change-default-size-for-gke-cluster-creation.yml b/changelogs/unreleased/39649-change-default-size-for-gke-cluster-creation.yml new file mode 100644 index 00000000000..6faa30177ad --- /dev/null +++ b/changelogs/unreleased/39649-change-default-size-for-gke-cluster-creation.yml @@ -0,0 +1,5 @@ +--- +title: Change default cluster size to n1-default-2 +merge_request: 39649 +author: Fabio Busatto +type: changed diff --git a/spec/lib/google_api/cloud_platform/client_spec.rb b/spec/lib/google_api/cloud_platform/client_spec.rb index acc5bd1da35..fac23dce44d 100644 --- a/spec/lib/google_api/cloud_platform/client_spec.rb +++ b/spec/lib/google_api/cloud_platform/client_spec.rb @@ -69,7 +69,7 @@ describe GoogleApi::CloudPlatform::Client do let(:cluster_name) { 'test-cluster' } let(:cluster_size) { 1 } - let(:machine_type) { 'n1-standard-4' } + let(:machine_type) { 'n1-standard-2' } let(:operation) { double } before do diff --git a/spec/models/clusters/providers/gcp_spec.rb b/spec/models/clusters/providers/gcp_spec.rb index ecd0a08c953..b38b5e6bcad 100644 --- a/spec/models/clusters/providers/gcp_spec.rb +++ b/spec/models/clusters/providers/gcp_spec.rb @@ -10,7 +10,7 @@ describe Clusters::Providers::Gcp do it "has default value" do expect(gcp.zone).to eq('us-central1-a') expect(gcp.num_nodes).to eq(3) - expect(gcp.machine_type).to eq('n1-standard-4') + expect(gcp.machine_type).to eq('n1-standard-2') end end |