Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
fa8c3159
Commit
fa8c3159
authored
Nov 06, 2017
by
bikebilly
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Change default cluster size to n1-standard-2
parent
cfc932ca
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
5 additions
and
5 deletions
+5
-5
app/models/gcp/cluster.rb
app/models/gcp/cluster.rb
+1
-1
app/views/projects/clusters/_form.html.haml
app/views/projects/clusters/_form.html.haml
+1
-1
spec/factories/gcp/cluster.rb
spec/factories/gcp/cluster.rb
+1
-1
spec/lib/google_api/cloud_platform/client_spec.rb
spec/lib/google_api/cloud_platform/client_spec.rb
+1
-1
spec/models/gcp/cluster_spec.rb
spec/models/gcp/cluster_spec.rb
+1
-1
No files found.
app/models/gcp/cluster.rb
View file @
fa8c3159
...
@@ -12,7 +12,7 @@ module Gcp
...
@@ -12,7 +12,7 @@ module Gcp
default_value_for
:gcp_cluster_zone
,
'us-central1-a'
default_value_for
:gcp_cluster_zone
,
'us-central1-a'
default_value_for
:gcp_cluster_size
,
3
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
,
attr_encrypted
:password
,
mode: :per_attribute_iv
,
mode: :per_attribute_iv
,
...
...
app/views/projects/clusters/_form.html.haml
View file @
fa8c3159
...
@@ -27,7 +27,7 @@
...
@@ -27,7 +27,7 @@
.form-group
.form-group
=
field
.
label
:gcp_machine_type
,
s_
(
'ClusterIntegration|Machine type'
)
=
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'
)
=
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
.form-group
=
field
.
label
:project_namespace
,
s_
(
'ClusterIntegration|Project namespace (optional, unique)'
)
=
field
.
label
:project_namespace
,
s_
(
'ClusterIntegration|Project namespace (optional, unique)'
)
...
...
spec/factories/gcp/cluster.rb
View file @
fa8c3159
...
@@ -7,7 +7,7 @@ FactoryGirl.define do
...
@@ -7,7 +7,7 @@ FactoryGirl.define do
gcp_cluster_name
'test-cluster'
gcp_cluster_name
'test-cluster'
gcp_cluster_zone
'us-central1-a'
gcp_cluster_zone
'us-central1-a'
gcp_cluster_size
1
gcp_cluster_size
1
gcp_machine_type
'n1-standard-
4
'
gcp_machine_type
'n1-standard-
2
'
trait
:with_kubernetes_service
do
trait
:with_kubernetes_service
do
after
(
:create
)
do
|
cluster
,
evaluator
|
after
(
:create
)
do
|
cluster
,
evaluator
|
...
...
spec/lib/google_api/cloud_platform/client_spec.rb
View file @
fa8c3159
...
@@ -69,7 +69,7 @@ describe GoogleApi::CloudPlatform::Client do
...
@@ -69,7 +69,7 @@ describe GoogleApi::CloudPlatform::Client do
let
(
:cluster_name
)
{
'test-cluster'
}
let
(
:cluster_name
)
{
'test-cluster'
}
let
(
:cluster_size
)
{
1
}
let
(
:cluster_size
)
{
1
}
let
(
:machine_type
)
{
'n1-standard-
4
'
}
let
(
:machine_type
)
{
'n1-standard-
2
'
}
let
(
:operation
)
{
double
}
let
(
:operation
)
{
double
}
before
do
before
do
...
...
spec/models/gcp/cluster_spec.rb
View file @
fa8c3159
...
@@ -36,7 +36,7 @@ describe Gcp::Cluster do
...
@@ -36,7 +36,7 @@ describe Gcp::Cluster do
it
{
expect
(
cluster
.
gcp_cluster_zone
).
to
eq
(
'us-central1-a'
)
}
it
{
expect
(
cluster
.
gcp_cluster_zone
).
to
eq
(
'us-central1-a'
)
}
it
{
expect
(
cluster
.
gcp_cluster_size
).
to
eq
(
3
)
}
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
end
describe
'#validates'
do
describe
'#validates'
do
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment