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)') diff --git a/spec/factories/gcp/cluster.rb b/spec/factories/gcp/cluster.rb index 630e40da888..61a4b01bb6b 100644 --- a/spec/factories/gcp/cluster.rb +++ b/spec/factories/gcp/cluster.rb @@ -7,7 +7,7 @@ FactoryGirl.define do gcp_cluster_name 'test-cluster' gcp_cluster_zone 'us-central1-a' gcp_cluster_size 1 - gcp_machine_type 'n1-standard-4' + gcp_machine_type 'n1-standard-2' trait :with_kubernetes_service do after(:create) do |cluster, evaluator| 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/gcp/cluster_spec.rb b/spec/models/gcp/cluster_spec.rb index 8f39fff6394..13811d67ba0 100644 --- a/spec/models/gcp/cluster_spec.rb +++ b/spec/models/gcp/cluster_spec.rb @@ -36,7 +36,7 @@ describe Gcp::Cluster do it { expect(cluster.gcp_cluster_zone).to eq('us-central1-a') } it { expect(cluster.gcp_cluster_size).to eq(3) } - it { expect(cluster.gcp_machine_type).to eq('n1-standard-4') } + it { expect(cluster.gcp_machine_type).to eq('n1-standard-2') } end describe '#validates' do