kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch '39649-change-default-size-for-gke-cluster-creation' into 'master'

Browse source 
Resolve "Change default size for GKE cluster creation"

Closes #39649

See merge request gitlab-org/gitlab-ce!15220
This commit is contained in:
Kamil Trzciński 2017-11-07 12:52:20 +00:00
commit 5c136f1d71
5 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/models/clusters/providers/gcp.rb
View file

@ -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,

2
app/views/projects/clusters/_form.html.haml
View file

@ -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'

5
changelogs/unreleased/39649-change-default-size-for-gke-cluster-creation.yml Normal file
View file

@ -0,0 +1,5 @@
---
title: Change default cluster size to n1-default-2
merge_request: 39649
author: Fabio Busatto
type: changed

2
spec/lib/google_api/cloud_platform/client_spec.rb
View file

@ -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

2
spec/models/clusters/providers/gcp_spec.rb
View file

@ -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